From 94076bc35380525ad04a9b00c9fddd6b155a3fd1 Mon Sep 17 00:00:00 2001 From: Erwann Chenede - Date: Thu, 2 May 2002 10:38:27 +0000 Subject: [PATCH] removed unneeded ref. #79977 2002-05-02 Erwann Chenede - * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): removed unneeded ref. #79977 * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): removed gdk_screen_use_virtual_screen function and use_virtual_screen member variable from GdkScreenX11. #79957 --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/gdkscreen.c | 17 ----------------- gdk/gdkscreen.h | 2 -- gdk/x11/gdkdisplay-x11.c | 3 --- gdk/x11/gdkscreen-x11.c | 10 ---------- gdk/x11/gdkscreen-x11.h | 1 - 11 files changed, 54 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e4a637fe..147ba9256b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-05-02 Erwann Chenede - + + * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): + removed unneeded ref. #79977 + * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): + * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): + removed gdk_screen_use_virtual_screen function and + use_virtual_screen member variable from GdkScreenX11. #79957 + 2002-05-02 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 03e4a637fe..147ba9256b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-05-02 Erwann Chenede - + + * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): + removed unneeded ref. #79977 + * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): + * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): + removed gdk_screen_use_virtual_screen function and + use_virtual_screen member variable from GdkScreenX11. #79957 + 2002-05-02 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 03e4a637fe..147ba9256b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-05-02 Erwann Chenede - + + * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): + removed unneeded ref. #79977 + * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): + * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): + removed gdk_screen_use_virtual_screen function and + use_virtual_screen member variable from GdkScreenX11. #79957 + 2002-05-02 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 03e4a637fe..147ba9256b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-05-02 Erwann Chenede - + + * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): + removed unneeded ref. #79977 + * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): + * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): + removed gdk_screen_use_virtual_screen function and + use_virtual_screen member variable from GdkScreenX11. #79957 + 2002-05-02 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 03e4a637fe..147ba9256b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-05-02 Erwann Chenede - + + * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): + removed unneeded ref. #79977 + * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): + * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): + removed gdk_screen_use_virtual_screen function and + use_virtual_screen member variable from GdkScreenX11. #79957 + 2002-05-02 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 03e4a637fe..147ba9256b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-05-02 Erwann Chenede - + + * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_get_root_window): + removed unneeded ref. #79977 + * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_use_virtual_screen): + * gdk/x11/gdkdisplay-x11.c (check_*_xinerama): + removed gdk_screen_use_virtual_screen function and + use_virtual_screen member variable from GdkScreenX11. #79957 + 2002-05-02 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index ccd55e351b..25b633ec78 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -237,23 +237,6 @@ gdk_screen_close (GdkScreen *screen) g_object_run_dispose (G_OBJECT (screen)); } -/** - * gdk_screen_use_virtual_screen: - * @screen : a #GdkScreen. - * - * Determines whether @screen is uses multiple monitors as - * a single virtual screen (e.g. Xinerama mode under X). - * - * Returns: %TRUE if multiple monitors are used as a single screen - ***/ -gboolean -gdk_screen_use_virtual_screen (GdkScreen *screen) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); - - return GDK_SCREEN_GET_CLASS (screen)->use_virtual_screen (screen); -} - /** * gdk_screen_get_n_monitors: * @screen : a #GdkScreen. diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h index 7a1814a466..cd636297b9 100644 --- a/gdk/gdkscreen.h +++ b/gdk/gdkscreen.h @@ -61,7 +61,6 @@ struct _GdkScreenClass GdkWindow * (*get_window_at_pointer) (GdkScreen *screen, gint *win_x, gint *win_y); - gboolean (*use_virtual_screen) (GdkScreen *screen); gint (*get_n_monitors) (GdkScreen *screen); void (*get_monitor_geometry) (GdkScreen *screen, gint monitor_num, @@ -96,7 +95,6 @@ GList * gdk_screen_list_visuals (GdkScreen *screen); GList * gdk_screen_get_toplevel_windows (GdkScreen *screen); -gboolean gdk_screen_use_virtual_screen (GdkScreen *screen); gint gdk_screen_get_n_monitors (GdkScreen *screen); void gdk_screen_get_monitor_geometry (GdkScreen *screen, gint monitor_num, diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 1f06886056..e700981805 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -130,7 +130,6 @@ check_solaris_xinerama (GdkScreen *screen) else { int i; - screen_x11->use_virtual_screen = TRUE; screen_x11->monitors = g_new0 (GdkRectangle, screen_x11->num_monitors); for (i = 0; i < screen_x11->num_monitors; i++) @@ -167,7 +166,6 @@ check_xfree_xinerama (GdkScreen *screen) else { int i; - screen_x11->use_virtual_screen = TRUE; screen_x11->monitors = g_new0 (GdkRectangle, screen_x11->num_monitors); for (i = 0; i < screen_x11->num_monitors; i++) @@ -209,7 +207,6 @@ init_xinerama_support (GdkScreen * screen) /* No Xinerama */ - screen_x11->use_virtual_screen = FALSE; screen_x11->num_monitors = 1; screen_x11->monitors = g_new0 (GdkRectangle, 1); screen_x11->monitors[0].x = 0; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index f052a82233..6126dc350c 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -45,7 +45,6 @@ static GdkWindow * gdk_screen_x11_get_window_at_pointer (GdkScreen gint *win_y); static void gdk_screen_x11_finalize (GObject *object); -static gboolean gdk_screen_x11_use_virtual_screen (GdkScreen *screen); static gint gdk_screen_x11_get_n_monitors (GdkScreen *screen); static void gdk_screen_x11_get_monitor_geometry (GdkScreen *screen, gint num_monitor, @@ -99,7 +98,6 @@ gdk_screen_x11_class_init (GdkScreenX11Class * klass) screen_class->get_default_colormap = gdk_screen_x11_get_default_colormap; screen_class->set_default_colormap = gdk_screen_x11_set_default_colormap; screen_class->get_window_at_pointer = gdk_screen_x11_get_window_at_pointer; - screen_class->use_virtual_screen = gdk_screen_x11_use_virtual_screen; screen_class->get_n_monitors = gdk_screen_x11_get_n_monitors; screen_class->get_monitor_geometry = gdk_screen_x11_get_monitor_geometry; screen_class->get_monitor_at_point = gdk_screen_x11_get_monitor_at_point; @@ -169,7 +167,6 @@ gdk_screen_x11_get_root_window (GdkScreen *screen) { GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); - gdk_drawable_ref (screen_x11->root_window); return screen_x11->root_window; } @@ -244,13 +241,6 @@ gdk_screen_x11_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } -static gboolean -gdk_screen_x11_use_virtual_screen (GdkScreen *screen) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); - return GDK_SCREEN_X11 (screen)->use_virtual_screen; -} - static gint gdk_screen_x11_get_n_monitors (GdkScreen *screen) { diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h index a439b2b86b..f65c694ba2 100644 --- a/gdk/x11/gdkscreen-x11.h +++ b/gdk/x11/gdkscreen-x11.h @@ -75,7 +75,6 @@ struct _GdkScreenX11 XSettingsClient *xsettings_client; /* Xinerama */ - gboolean use_virtual_screen; gint num_monitors; GdkRectangle *monitors; }; -- 2.30.2